From: Joey Hess Date: Wed, 10 Sep 2025 17:34:17 +0000 (-0400) Subject: windows build fixes X-Git-Tag: archive/raspbian/10.20251029-1+rpi1~1^2~3^2~121 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=3c1975ce7ed43cb0349a5ea570152a006cae264b;p=git-annex.git windows build fixes --- diff --git a/Utility/FileIO.hs b/Utility/FileIO.hs index 99ea538823..3624f940d2 100644 --- a/Utility/FileIO.hs +++ b/Utility/FileIO.hs @@ -55,6 +55,7 @@ import Prelude (String, return) import qualified Utility.FileIO.CloseOnExec as O import qualified Utility.FileIO.String as O import qualified Data.ByteString as B +import qualified Data.ByteString.Lazy as L import Control.Applicative withFile :: OsPath -> IOMode -> (Handle -> IO r) -> IO r @@ -118,17 +119,17 @@ openTempFile p s = do readFileString :: OsPath -> IO String readFileString p = do p' <- toOsPath <$> convertToWindowsNativeNamespace (fromOsPath p) - I.readFileString p' + O.readFileString p' writeFileString :: OsPath -> String -> IO () writeFileString f txt = do f' <- toOsPath <$> convertToWindowsNativeNamespace (fromOsPath f) - I.writeFileString f' txt + O.writeFileString f' txt appendFileString :: OsPath -> String -> IO () appendFileString f txt = do f' <- toOsPath <$> convertToWindowsNativeNamespace (fromOsPath f) - I.appendFileString f' txt + O.appendFileString f' txt #endif #else diff --git a/Utility/Shell.hs b/Utility/Shell.hs index 5f9b08909d..5d2c0191ec 100644 --- a/Utility/Shell.hs +++ b/Utility/Shell.hs @@ -19,6 +19,7 @@ import Utility.SafeCommand import Utility.Path import Utility.Exception import Utility.PartialPrelude +import Utility.FileIO (readFileString) #endif shellPath :: FilePath